diff options
Diffstat (limited to 'cpp/RPMTools.py')
| -rw-r--r-- | cpp/RPMTools.py | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py index 21cd52a2692..4b6d93f2e8d 100644 --- a/cpp/RPMTools.py +++ b/cpp/RPMTools.py @@ -169,7 +169,7 @@ transforms = [ ("file", "lib/Ice.jar", "lib/Ice-%version%/Ice.jar" ), ("dir", "slice", "share/slice"), ("dir", "ant", "lib/Ice-%version%/ant"), ("dir", "python", "lib/Ice-%version%/python"), - ("dir", "doc", "share/doc/Ice-%version%"), + ("dir", "doc", "share/doc/Ice-%version%/doc"), ("file", "README", "share/doc/Ice-%version%/README"), ("file", "SOURCES", "share/doc/Ice-%version%/SOURCES"), ("file", "ICE_LICENSE", "share/doc/Ice-%version%/ICE_LICENSE"), @@ -225,10 +225,18 @@ solution, and much more.""", ("lib", "lib/libIceXML.so.VERSION"), ("lib", "lib/libSlice.so.VERSION"), ("dir", "share/slice"), - ("dir", "share/doc/Ice-%version%/images"), - ("dir", "share/doc/Ice-%version%/reference"), - ("xdir", "share/doc/Ice-%version%/config"), - ("xdir", "share/doc/Ice-%version%/certs"), + ("dir", "share/doc/Ice-%version%/doc"), + ("file", "share/doc/Ice-%version%/certs/cacert.pem"), + ("file", "share/doc/Ice-%version%/certs/c_dh1024.pem"), + ("file", "share/doc/Ice-%version%/certs/client_sslconfig.xml"), + ("file", "share/doc/Ice-%version%/certs/server_sslconfig.xml"), + ("file", "share/doc/Ice-%version%/certs/c_rsa1024_priv.pem"), + ("file", "share/doc/Ice-%version%/certs/c_rsa1024_pub.pem"), + ("file", "share/doc/Ice-%version%/certs/s_dh1024.pem"), + ("file", "share/doc/Ice-%version%/certs/s_rsa1024_priv.pem"), + ("file", "share/doc/Ice-%version%/certs/s_rsa1024_pub.pem"), + ("file", "share/doc/Ice-%version%/certs/sslconfig.dtd"), + ("file", "share/doc/Ice-%version%/certs/sslconfig.xml"), ("file", "share/doc/Ice-%version%/README.DEMOS")]), Subpackage("c++-devel", "", @@ -262,17 +270,6 @@ solution, and much more.""", ("file", "share/doc/Ice-%version%/config/makedepend.py"), ("file", "share/doc/Ice-%version%/config/makeprops.py"), ("file", "share/doc/Ice-%version%/config/Make.rules.Linux"), - ("file", "share/doc/Ice-%version%/certs/cacert.pem"), - ("file", "share/doc/Ice-%version%/certs/c_dh1024.pem"), - ("file", "share/doc/Ice-%version%/certs/client_sslconfig.xml"), - ("file", "share/doc/Ice-%version%/certs/server_sslconfig.xml"), - ("file", "share/doc/Ice-%version%/certs/c_rsa1024_priv.pem"), - ("file", "share/doc/Ice-%version%/certs/c_rsa1024_pub.pem"), - ("file", "share/doc/Ice-%version%/certs/s_dh1024.pem"), - ("file", "share/doc/Ice-%version%/certs/s_rsa1024_priv.pem"), - ("file", "share/doc/Ice-%version%/certs/s_rsa1024_pub.pem"), - ("file", "share/doc/Ice-%version%/certs/sslconfig.dtd"), - ("file", "share/doc/Ice-%version%/certs/sslconfig.xml") ]), Subpackage("dotnet", "ice = %version%, mono-core >= 1.0.6, mono-core < 1.1", @@ -292,7 +289,7 @@ solution, and much more.""", ("dll", "bin/icepatch2cs.dll"), ("dll", "bin/icestormcs.dll")]), Subpackage("csharp-devel", - "ice-dotnet = %version%, mono-devel >= 1.0.6, mono-devel < 1.1", + "ice-dotnet = %version%", "Ice tools for developing Ice applications in C\#", "Development/Tools", """Ice is a modern alternative to object middleware such as CORBA or COM/DCOM/COM+. |